Diff3

Diff3[ancestor,first,second] returns a representation of the three-way diff between ancestor and two independently changed versions of ancestor.

Diff3[ancestor,first,second,format] represents the diffs in the indicated format.

Please visit the official Wolfram Language Reference for more details and examples on core symbols.